Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 21 Apr 2010 23:03:28 +0000 (23:03 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 21 Apr 2010 23:03:28 +0000 (23:03 +0000)

Trivial merge